Merge version 5.12.5+dfsg-2+rpi1 and 5.12.5+dfsg-7 to produce 5.12.5+dfsg-7+rpi1

diff --cc debian/changelog
index b8de4b8ebf61d055f0c860f27d87b0e2c660ce02,85d207fa3a33aff393a415e3a55025743ba3124f..60dd4d4ba933b639e240e555be10b8d69039fb87
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,56 +1,66 @@@
- qtbase-opensource-src (5.12.5+dfsg-2+rpi1) bullseye-staging; urgency=medium
++qtbase-opensource-src (5.12.5+dfsg-7+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes introduced in 5.6.1+dfsg-2+rpi1] by Peter Michael Green]
 +  * Partially fix clean target.
 +
 +  [changes introduced in 5.9.1+dfsg-9+rpi1 by Peter Michael Green]
 +  * Disable neon (-no-neon no longer seems to work, so edit configure.json instead)
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 04 Nov 2019 06:21:12 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 31 Jan 2020 16:03:36 +0000
++
+ qtbase-opensource-src (5.12.5+dfsg-7) unstable; urgency=medium
+ 
+   * Changeless upload to allow arch:all binary packages being built after
+     passing NEW queue.
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>  Thu, 23 Jan 2020 09:08:39 -0300
+ 
+ qtbase-opensource-src (5.12.5+dfsg-6) unstable; urgency=medium
+ 
+   [ Lisandro Damián Nicanor Pérez Meyer ]
+   * Split the doxygen .tags files into a new qtbase5-doc-dev package,
+     see #922707.
+   * Make relevant development packages depend upon
+     qtbase5-dev | qtbase5-gles-dev. This allows building packages with either of
+     them (Closes: #949028).
+ 
+   [ Helmut Grohne ]
+   * Improve cross building: (Closes: #876131)
+     + Pass --external-hostbindir to use the native qmake.
+     + Pass a cross platform_arg.
+     + Verify that the qmake self-dependency exactly matches the version.
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>  Wed, 22 Jan 2020 14:54:20 -0300
+ 
+ qtbase-opensource-src (5.12.5+dfsg-5) unstable; urgency=medium
+ 
+   [ Pino Toscano ]
+   * Limit the libdrm-dev build dependency as linux-any, as it is only useful
+     on Linux. (Closes: #947675)
+ 
+   [ Dmitry Shachnev ]
+   * Backport upstream patch to add RISC-V detection.
+   * Update debian/libqt5network5.symbols from buildds’ logs.
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Tue, 31 Dec 2019 14:19:15 +0300
+ 
+ qtbase-opensource-src (5.12.5+dfsg-4) unstable; urgency=medium
+ 
+   * Build-depend on libdrm-dev and libxcb-glx0-dev, to fix FTBFS.
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Sun, 22 Dec 2019 00:28:25 +0300
+ 
+ qtbase-opensource-src (5.12.5+dfsg-3) unstable; urgency=medium
+ 
+   * Backport upstream patch to fix uic handling of .ui files with global
+     includes. Thanks to Alexander Volkov for the pointer!
+   * Stop depending on libgl1-mesa-dev and libgles2-mesa-dev, which are
+     transitional packages in mesa ≥ 19.3.0~rc6-1.
+   * Also make qtbase5-dev explicitly depend on libegl-dev (closes: #947117).
+   * Move the compatibility symlinks from qtbase5-dev-tools to qtbase5-dev
+     (closes: #939653).
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Sat, 21 Dec 2019 14:30:03 +0300
  
  qtbase-opensource-src (5.12.5+dfsg-2) unstable; urgency=medium
  

diff --cc debian/patches/series
Simple merge

diff --cc debian/rules
Simple merge